Fix feedback from kibit static analysis
Merge branch 'master' of github.com:wayoutmind/melee