Revert "Consolidate duplicate variables."

This or the other commit is causing problems with Cygwin users with baksmali
and paths with spaces in them. Will look at fixing the actual issue, but this
needs to be fixed first.

This reverts commit 8b16e1fac446a25a876d0322b65bd1a215f7ee23.
Versioning to 2.8.43 (to track revert efficacy)