Eliminating some calls to ctComp since types can be reconstructed more
easily.  This is in an attempt to simply the AST even more.