More refinement of the offline work.

It's still doing everything twice, though.