WITH can be followed by ORDER BY and ORDER BY can be followed by RETURN

Also necessary for DATAGRAPH-338 workaround.