In my PR, I moved _partition... up to xmoduleDescriptor and out of the persistence layer; so, you should be able to clean this up.