So, let's not hold up this PR because a few trivial lines are untested; none of pulpito has unit test coverage - I manually test it. It'd be nice to fix that, but it's not happening today.