renumerate expression grammar
raise with-expressions in expression grammar