minor tweaks to support closure changes

And macros.. The closure fixes are not the most elegant approach, but hopefully this hack won't be required forever.