CompositeClosures and OSLBSDF fixes / improvements