Merging this separately so the commit with the tooling change is readable. This is a follow-on to #1167 which turned prettier on.
Merging this separately so the commit with the tooling change is readable. This is a follow-on to #1167 which turned prettier on.