[master] Minor tweak.
[master] Fix copyright.
[master] Revert last night's tweak.  Improve test.
[master] Add toString().
[master] Revert changes.  Reworking solution.