Following through AST changes in CgTypes.