Some cleanups/renaming.  Make sure we build a full batch of data.