Supress successfully matched rows

This is essentially PR #203 (suppress successfully matched rows) + a bit final clean-up.

All relevant discussions are captured in PR #203