Bug 897202 - Add some double canonicalization, r=luke a=abillings.