Eliminated TOKENEXTRABITS

Noticed small performance gains, depending on material.

Change-Id: I334369f6312bc19aa73481fc3f790ab181e11867
3 files changed