More refactoring for method chooser