I believe that this reshaping -- which flattened the samples -- was a hold-over from the pointwise variant.  It was causing test failures.