The code in WT_SESSION.close does work using the WT_CONNECTION_IMPL default session, but that means the API_END_RET_NOTFOUND_MAP session cleanup happens in the context of the default session, which isn't correct.