WGS84 token fixes

Solves #627 
Let's just say that if the style guide is against clearer ifs ... then we'd definitely have to change the style guide ... :-)
99% (or more) of the code of the broker is using the (() && ()) approach.
The style-guide tool finds it ok. The style guide itself, I don't know