Fix some more scrutinizer-ci.com’s warnings.