Detail: Merge some whitespace fixes from release.