Better matching between runtime type names and dwarf type names.
Other clean up.