Add new grammar, now with branching possibility!
Extend grammar rewriting to products and handle all expressions!