Findbugs cleanup.