Update haddocks for CmdLine.  Simplify a few constraints.