[2.2] Intermix optional match and cartesian product steps