Also get rid of variables that are now kinda redundant, since the dictionary iterator was removed. This is related to PR #3949.
Attach a file by drag & drop or click to upload