Finishes refactoring helpers.