Merge "Tidy up x86 assembler and fix byte register encoding."