Round #2 of scan-build warnings cleanup