Code cleanup, related to fix for Issue 99.
5 files changed