Spacing and alignment cleanups.
No functional change.
(cherry picked from commit bde3cdf18d9881abfbe45337020e996dbeabca76)