Make `CLI` behavior and output match latest conventions