Fix a nasty bug in the type remapping stuff that I added that is breaking kc++ on