Address PR feedback for trailing commas