findBugs seems a little non-deterministic. Some new bugs arose simply from the package movements.

Seems that deleting this block doesn't create find bug warnings, though. Can you remove it on the push?