Simplify match listeners

Performance results don't change anyway: Guava wins; 3 times faster!