Minor refactoring in StatusOperation and ongoing refactoring in UpOperation.
Merge Gregor and Steffens changes