Keep old methods and factor out common logic.