First draft of issue #62.