Simplify/optimise mixin.