Merge "Some static-analysis-based code cleanup" into tm-qpr-dev