Further work on the example in #1.