Fix issues with type abbreviations

Close #730.
Close #733.