Implemented some Scrutinizer patches, for code quality.