x86: fold two JMP templates
    
    Now that the AMD64 check in match_template() applies to 64-bit code
    only, the non-64-bit and the Amd64 template can be folded, as being
    otherwise compatible with one another. (Oddly enough the same doesn't
    apply to CALL, due to the suffixes it permits, while JMP doesn't
    allow for any.)