I'm working on one type of warnings at a time, otherwise the change sets are too big.  So this spacing/comments issue will come up in a future PR for sure.