Bug 1089665 - Fixup dictionary objects earlier after swapping them, r=billm.