A little extra code cleanup, after copying some of the fixes to the Windows build.
Merge branch 'master' of https://github.com/KamionRenokai/cricket-kamodon