Also, stop poping it: nothing else seems to be accessing the containing
dict, so mutating it does not seem necessary.