Encapsulate the statetements to clarify their expressions.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev