Change --raw-always-valid (et al) to --bare-always-valid to avoid confusion.