Fix more issues pointed out by eslint

This is the next batch of style cleanups.

Unlike !606 (merged), those are more general issues, however the changes are still relatively small.

There's another batch in line after that with bigger changes, but still things I'd like to have fixed (mixing tabs and spaces, accidentally using a 3-space indent instead of 4-space etc.).