Fix underscore swap mixin to always return the indexable.