Bug 1111218 - Fold congruent type barriers. r=bhackett