Issue #172:  minor cleanup