Another try.
Tweak.
More tests.