Cleanup: remove trailing commas, and clear some other idea-warnings