improvement for 'changed the way requires_model_validation/requires_checks options are handled