Small fix to prevent const pointers in closure env, which cause C warnings