Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields