Fix broken indexing logic following the move to strb.

This leads to silent incorrect results.