Also not sure about this change. This wasn't a mixin, so it was okay for it to extend 'nt:unstructured' and other mixins at the same time. Remember, non-mixin node types can extend other non-mixins and mixin, but a mixin cannot extend a non-mixin.