Fix for closures with sunpro compiler