Import patch for several FindBugs corner cases.