Tweak handling of options for validator.