Updating: template argument: S2ZEvar(s2v) -> S2Evar