More accurately reflect whitespace handling around type and subtype.