Also fixed a bug where a `--dry-run` will result in an error because
of the recently added status support.

There are several other output inconsistencies that I noticed and filed
as issue #1135.

Closes #1130