Moved things around for latest version of fontspec.sty