Followup to bug 840417 to fix static checking errors, r=bz