Fix up typename parsing.