Some more style improvements

See commit messages for more info.