Reformat code. Tweak documentation wording and callout syntax. See #3914, see #3901 Original pull request: #3915.