Sync with https://github.com/sebastianbergmann/php-code-coverage/commit/2990bd9b0093867f263afafaf772f2a3af3495fe
Sync with https://github.com/sebastianbergmann/php-code-coverage/commit/5d6c3b4347b8141b43c7e253c3004f58ae361f5d
Eliminate superfluous code
Cleanup & Update