Minor fixes for the --skip-keys option.