Attempt 2 at fixing scrutinizer

I tested this with the command line version of scrutinizer and got no errors.