Bug 1056388 - Add assertions as per TODO. r=botond