Minor enhancement to validation-policy.