Removed some bonus trailing commas and dupe vars

Cleanup for #790