Merge pull request #2942 from sdwalker/variable-cleanup