Fixes "probable bug" warnings:
Statement has emtpy body
Suspicious call to HashMap.get
Variable is never used (one was a bug)