Merge "Factor out repeated shift instructions to reduce code size"