simplify FormatSmart to correspond with docs

Also run gofmt.

This is an alternative fix to https://github.com/juju/cmd/pull/2