Yes, and the crazy trailing comma should be exterminated. Pull request done.