Updated for scoverage 0.99.5