Remove dependency on Object.mixin