Further Refactoring

SystemRollout_Greedy can now stand on its own.  Farsighted version is
being refactored and genericised still.