Slight cleanup on AST stuff.