Fix certain constraints going unsolved due to unzonked tyvars.