Fix Template mixins, revert back to old MRO for base mixins (seems to be
working with sample classes)