Use a more accurate suffix removal amount.

It doesn't make a difference because of the prefix/suffix adjustment
happening in post-processing anyway. But this is more correct.