Remove Shifter, use more constant.