Cameron Silvestrini

This makes it consistent with the version of ktlint used internally. Also enables trailing commas, since we've upgraded to Kotlin 1.4. Auto-fixed everything using `./tools/sigh ktlint --fix`.