Re-fix split_disasm_line, minor enhancements