Cleanup in `util.datastructures`. Removed a bunch of classes (including DictProxy) and replaced accordingly throughout the framework.