Also fixes what appears to be a merge error in condiments, which made my compiler complain. oh, someone also added FILE_DIR previously, as well. Fixed that too.