Revert "Sync again with unclebob/master"

This reverts commit d5a0152fd4762a828f1f806090a6b21c0717e8cb.
Revert "removed dead code"

This reverts commit d09fb4ce66cbc536072a0ac952a986a7ad59dbcb.
Revert "Slim Query/Table Table: manage variables assignment in VariableStore"

This reverts commit 57fc55eeb71f10aafe82fae4fe7e12b1f6ba95a5.