Address kibit suggestions.
Rewrite for tools.cli 0.3.1.