callcc improvements