Kyle and I talked about it briefly the other day about splitting out the replace part of this mixin. I agree it should be removed. I think we were thinking about holding off on that exact change, but maybe I'll just go ahead and do it anyway, unless there's a good reason not to?