Fix 17.0 dict() warnings.