Fix from Standard8 to use EqualsExceptRef