Scrutinizer fixes.

A few small fixes (based on feedback from Scrutinizer CI) for you, @jameskoster.

Merge as desired. :)