Various changes pertaining to style, grammar, and consistency

[adamvoss]

Mostly minor, stylistic things in noticed while reading where grammar could be improved, complexity reduced, or consistency increased.

This is a squashed commits, feel free to comment if you want more details, or have opinions, on any of the particular changes.

[adamvoss]

@sjrd Thanks for merging these!