Clean up CountGeneric#matches?