Fix regexp ShiftRightArith break, and exploit more Shift macros