Address some FindBugs complaints.