Fix up more stupidities in the type parsing. It might even be getting close