Delete trailing whitespace again
Re-apply copy-editing

Repeat of commit eaf52b5d20f5922a97ba7ab40bea85aeb924a9a6
Lost in merge 8849f9235f6c1133b64c5a7235d3af6a72e8e2a6