solved Bug 1033630

Request to review and merge solution for Bug 1033630.
I really don't like these variable names.
1) they should have var <name>
2) a more specific name for each variable

I am unclear what these variables do, maybe there is another way to solve this, maybe not.  lets add a comment here to explain them.