Comment by andybak

Could some of this be mitigated by running a prettifier post-merge?