Partially revert "Fix a few variable reassignments."

This partially reverts commit b2e89111f9201f0205d5b2be13a1efe77f153075.

WDK is old so things start to get weird...

Fixes #89.