Make better use of some of our type synonyms