Tidy up.

PostScript and TTF/OTF working.