Rework continuations based on Hamburg working group discussion.