Making the AST more friendly.