More work on fixing type names.  ASM is bloody horrible.