Update to the latest version of XBlock

Yeah, that's very true. We don't use `popitem` either. I'll switch them to regular dicts.