Annotate for static analysis cleanness
Merge pull request #1 from JensAyton/static-analysis-clean

Annotate for static analysis cleanness