Cleaner Match interface; bye support.  Tests.