Fix C++ complaints about final enum commas