Fixing some of the mess I made related to issue #46

A number of outstanding issues remain relating to issue #46. The current
content does not fully describe the behavior as I currently understand
it.