fixed some warnings reported by FindBugs, made code easier to read.
Authored by: mrieser 2010-02-25
Parent: [r10586]
Child: [r10588]