Fix for unboxed closure changes

Closes #33