Tidying up ValuePresenterFinder behavior