#385 Optimize shuffle buffer logic for large shuffle size preferences.  Fewer round trips.