Minor code cleanup in CLI.