Can we avoid formatting changes on the comments?  git blame is more useful if lines generally only change when they have different semantics.