Issue #223 micro-optimization and test coverage