MAINT: shuffle functions around