Updates to support use of oparent in non-ODL dependent code

No match.