re-enable optimizeShifts in non-asm builds; fixes #2481