Refactor findNearby such that it no longer uses a special find variant.