Switching to types-as-attributes in parser