DEV: Tweaks to CLI.