Improve mas lexing of shifts.