Update some MATCH expressions to Neo4J 2.0 syntax - “r?” not supported any more, so replaced with “optional match”.