parser/ast cleanups