Don't shadow important variables.
Merge pull request #998 from lavalamp/fix

Don't shadow important variables.