Merge of cppccheck fixes.