Bug 1031440 - Fix an unused variable and a single-use variable pointed out by Neil. r=khuey

--HG--
extra : rebase_source : d326c1b131f777c3104f0179ab3b5b385d8bac48