Issue #247: another stab at clean up ... found some inconsistencies that might be related