Avoid redeclaring variables

Fixes #218. Firefox Nighlty (35) is strict about this. PB can now run on
Nightly.
Merge pull request #221 from tie-rack/fix-redeclaration-of-variables

Avoid redeclaring variables