Use "||" instead of "or" for style reasons

The only new commit is 194af6e. The rest is a merge with master.

Side note: I had no idea "or" was even a valid C++ keyword (and portable at that). And here I was, about to call you out for drinking too much Python kool-aid :)

Still, using "||" is more consistent with the rest of our code, hence this PR.