rename 'clos' and 'env' internal names
gdb stuff
more gdb stuff