Avoid convoluted syntax
Use more robust comparisons, be more forgiving where it's not important
Don't assume temp file writing worked
Changelog
Update scrutinizer config