Change grammar to allow for drop sets. Proper persistence still todo.
Proper persistence for drop sets; relational smell out of C types