Fix mis-merge in class_mapper.

At some point I probably nuked Disassembly and DisassemblyType from
class_from_id().
Use disassembly_type in place of data_type.