fixup! Remove many of the metaclasses from XBlock.