Fix #522 - Remove trailing commas