Followup fixes to bug 759422 to end the CLOSED TREE, r=BenB and bustage.