Implemented wrap_with_context_thunk() and wrap_with_contexts()