1.6 for 1.7 bis

Keep the arrow on the line of the match clauses (same remark applies to some occurrences below as well).