Yeah, I only discovered `dict.copy()` partway into the patch; missed rewriting a couple of these. Thanks. Shallow is ok here.