Detail: Merge new version of container_fwd.
And a couple of old failure markups that I hadn't merged yet.