Fixes #4467, #4490.

[soc]

This should fix #4467 and a huge amount of the formatting problems around #4490.

[acruise]

If this could be split up into multiple smaller patches, it would be less controversial. For example, one patch that only changes foo' (incorrect syntax, breaks formatting pretty badly) to foo` (correct syntax but may not precisely match the original intent of the long-ago author).

Ironically, I had to edit this post to escape the backticks. :)

[acruise]

I would suggest avoiding the capitalization and line-break changes for now, they make the patch much bigger and don't really add much value.

[soc]

This has been pulled in trunk. Thanks to kzys and dubochet!