fix handling of type abbreviations