Fix problem on some 5.3 builds and Clover coverage.