Fixes for analyzer
Remove unused assignment
Clang analyzer appears to ignore function attributes
Analyzer ignores function attributes
Minor fixes for scanner