Added ASTHelper.asExpression() and used it throughout.