Added operator labels to expressions.
Added optional type keyword.