Not sufficient to drop bad options; good ones need to be passed through.

Test not only that bad options get dropped, but that valid ones are passed through -- and fix bugs necessary for that extended test to pass.

Also adds missing `--lock-never`, `--lock-once` and `--lock-multiple` arguments to the whitelist.