Bug 836654 - Fix -werror silliness.  r=me