Merge pull request #2660 from clumens/coverage
Test: coverage: Use the right markers for coverage exclusion blocks.