It looks like this trailing comma is causing the 1.8.7 failure. Could you update the generator to drop the trailing commas so that we can get 1.8.7 passing as well? Thanks!