Rework Match <-> i.t.e w/ aggressive flattening. Test transformations.