Fix CallContext NDC cleanup problem