Use the latest F_DIR_*() defines (whose names were tweaked).