Various refinements to output of "switch" command.