Try to avoid overconstraining when comparing and/or types

Review by @smarter