Touch up on previous commit

https://github.com/harfbuzz/harfbuzz/pull/1273
8 files changed