Okay. But, this seems to break the notebook's ability to be roundtripped through JSON in the current implementation since both toJSON and fromJSON rely on these maps. I can remove it and associated tests in roundtrip.js, if this is all going to go through a refactor though.