fixup! Extract Field machinery out of XBlock into 2 mixins