FindBugs and lint cleanup.