Remove more type annotations from the AST