swift234

Generalize a condition to allow _OptionalNilComparisonType.  We now diagnose all of
the cases the hack Mark reverted used to (and more).