Cleanup: Apply scrutinizer fixes.