Ran FindBugs, and fixed things.