Simplify expression and make PMD happy
Some refactoring + picking up the latest WSS4J change