To reassemble versioned endpoints, also saving endpoint constructor
objects.
Removed a bunch of dead code for defer and parallel blocks.