Require a WITH when going from OPTIONAL MATCH back to MATCH