I just made the last set of changes to the core to fix some bugs in my codegen. I will try to clean up the RDF similiarly soon.