Agreed, but let's make those changes in a separate PR. I want to minimize the number of non-style changes in this pass.