Simplify wrapper by removing wrapper's mixin