Do a pass on compiler warnings

[pakoito]

Run with ./gradlew test, take a look at the warnings, and see if there's any quick win, shadowed variable, or other quick fixes that could be applied.