Some more operations refactoring.