Fix for closures with sunpro compiler
5 files changed