Simplified the TYPEQ-AST by not duplicating type information.