Issue 372 4

Addresses issue #372.

@dwf, there are comments and questions in the commit messages.