Merge pull request #573 from danvk/coverage-cleanup