Fix formatting preservation for match

Switch list insertion maps to use class name

Also highlights that the list insertion entry for Expr\Match
was not used.

Fix file name