Applied scrutinizer patch - minor more precise coding style fixes