This is almost completely unused now, only the CommanderFactor still uses it, and then the change should be trivial. Nix this?