Fix a race condition due to a combination of data-unwrap and
data-render. This is hard to test for; the tests added in fact don't
demonstrate the issue, but I've seen it in the wild and waiting for
data-render to complete before removing data-unwrap seems to be
the right thing to do. Also wait with all the other template
post-processing now until data-render is done.