Changes to OOF required by last openchange upstream changes

Variable expansion is done by oof.py controller