More work on issue #2.