Fixes for OSL object space + hierarchical instancing.