Cleanup finder methods

Some incremental refactors of code in finder_methods. See individual commits for explanations.