Removed some bonus trailing commas and dupe vars
Merge pull request #791 from pdehaan/issue-790-comma

Removed some bonus trailing commas and dupe vars