Eliminating variable reuse

It's bad to reuse variables and it leads to bugs.  See my commit message for a fictitious example of how that could occur.

I saw this during your great presentation today and thought I should submit a pull request.