Cleanup: Scrutinizer fixes.