Aesthetical changes. No functional change.

Manually applied humdinger's Decorator_aesthetics.diff patch from #7874.