Revert "Eliminate useless var definitions."

This reverts commit 22bcdae1b3618f4397a00febbbb3ee7085971520.