Plugin `--cli-config` improvements. Fixes #1951.