fixup! Move xblock-family mixins into a separate python module