- Simplify arithmetic
- Combine branches
- When nesting branches do more predictable branches first

About 2.6% faster decodes at very high token rates.

Change-Id: I2802fd47a78c144e4d89c59288590fc4b095a504