Make the all hits feature more readable

(i.e. don't depend on data generation, be explicit
about it)