Remove a few more spurious formatting changes