NoSQL DSL experiment (continue):

- Minor refactorings