Hygiene: Remove trailing commas

Change-Id: I249a384b2b4ddf119e345d011d1ab5ef3bcf4c69