Convert Cypher to use 2.0 dialect