[C2hs] patch applied (c2hs): Use an optional expression production to simplify a couple productions.