Make sure to rewrite WITH as well as RETURN clauses
Merge pull request #2172 from systay/rewrite-with-clauses

Make sure to rewrite WITH as well as RETURN clauses