More mixin pattern improvements