Merge pull request #3278 from harfbuzz/more-std

More standard idioms