Merge "Tidy x86 assembler."