Minor find refactoring

This whole thing passes tests, but doesn't seem to work
interactively. It's probably easy to fix, but I can't stay awake.