More disassembler work