[BUGFIX beta] Single variable declaration with assignment.
Merge pull request #10037 from rwjblue/single-var-declaration-cleanup

[BUGFIX beta] Single variable declaration with assignment.