Further refinements.  Starting refactoring of ModeledCommandParameter