Moved type synonyms around for clarity.