I like your refactoring of this hits-gathering section very much: it's so clear now what it returns.