Improvements to class mixin.