Get rid of some NOTEs.
Improve debug spew in _match.