context is now received as a frozendict, so pop is not allowed on it directly. We need to make a copy of it first, so if context is None: context = {} is not enought...