Cleanup CutFlowSvc configuration a bit

Cleanup CutFlowSvc configuration a bit. This should not change any behaviour. Still running full-unit-tests to be sure.

/cc @tsulaia