Committing these to make the FindBugs plugin happy :)