Small cleanup using static analysis
Merge pull request #386 from HairyFotr/patch-4

Small cleanup using static analysis