[MOD] Simple refactoring.
Merge branch 'master' of https://github.com/sirixdb/sirix