Some tweaking around the AST.