Improvement in no-wrap to use existing mixin