Big binnedData cleanups.