[temp.constr] Rewrite subsumption rules.
Merge branch 'subsume'