Make shifts by constant use immediates rather than a register.

Remove and/or tests