cli: further simplifications