Cleaning up code coverage

There are still vestigial elements, but those are perhaps a TODO item
for later.