Thanks much – great catches. I may follow up with this and see if I can somehow add it to our findbugs checks...