Improved test coverage.
Readability tweak.