Refining with FindBugs.
Minor changes.