Move mixins out of type