Bug 836920 followup.  Fix warnins-as-errors bustage. r=tree-is-aflame-dance-around-it