Move preview fields into BatchPreviewPresenter

The test for the new presenter documents more clearly which counts
include existing mappings and which don't.