Minor reorganization of the CLI spec