Dead smilies

After the great renaming yesterday (Dec 11) there are some sequence issues in ther order that you’re including files.
The only one I’m sure is WRONG is the inclusion of vars.php which now happens at the top of wp-settings.php where the variable $smilies_directory has not yet been set.
I noticed this because all my smilies suddenly stopped working … I fixed it for now by moving that line (require ($abspath . $b2inc . ‘/vars.php’);) to the end of the file.