Tiny simplification to core-cli.