Removed some bonus trailing commas and dupe vars

Cleanup for #790
Dupe var, see L5 above.