Thanks to @TimS I found another sneaky bug hidden away. And while I was testing that out another one was revealed. I really should add some more tests…
Plus I did some refactoring (first bit of housekeeping, not in the list above).
And the result is:
v1.0.1