A bit of restructuring to suit new command processing structure.