More OSL closures work.
Merge pull request #329 from est77/OSL_work

More OSL closures work.