Cleanup per FindBugs.