restore 100% coverage

and a bit of cleanup (and yet another squashed commit)