And simplify. Fixes regression introduced two commits ago. Fixes https://github.com/behdad/fonttools/issues/205