[GHC] #15846: Re-examine mkResidualConstraints