Bug 1014296 - Add a couple of missing variable declarations (and set strict mode to prevent them from coming back). r=bholley/billm

--HG--
extra : rebase_source : e9de2ec53054a5a189390d672a18053f28849ec8
extra : histedit_source : 95e2e5e498c05206c8c05d8e079466e15ce67b20