Explicit --safe for completeness.
Somewhat more descriptive --help.
Fix tests compilation.