Tidy up Simon's FontSpec abstraction.