Finish refactoring the Status operator. Fix compile errors.