Merge "Tidy x86 disassembler"