Removed an extra variable I'd added.

Also cleaned up some whitespace-around-operator issues.
While removing the extra variable seems to make the code more ugly, all it does is reveal the pre-existing ugliness that had been masked in the past.  Trying to find a fix, or even try to come to a real understanding of why this section of code is the way it is, is out of my scope for this task.