Various cleanups for scrutinizer