Similarly for grammar
Stencil interpreter as a transformation from stencil->diagram
More tweaks + refactoring on stencil