More work on fixing type names & descriptors.  Man ASM makes it hard!