Fix generic shift expansion when shift amount is 0