Integrated the new stack-frame save/restore mechanism for options and directories.