Patch Set 2: Looks good to me, but someone else must approve; IP review completed

(2 inline comments)

From my perspective this can go through and the change to the Merger (let inserter/reader be passable from higher layers) could come next.