Completing operation-source refactoring