Scrutinizer Auto-Fixes

@bramdevries requested this pull request.

It consists of patches automatically generated for this project on Scrutinizer:
https://scrutinizer-ci.com/g/bramdevries/changelog/