Major changes to structure of mixins.