Overall cleanup, mostly of the AST stuff.