Fix expansion of right shifts.
Ambiguate hyphens.

Prevent hyphens from being lexed as unary, so that the parser can decide
whether they are being used in a unary or binary way.