Reusing more code to make scrutinizer-ci.com happier