CID 712421: Fix unintended sign extension.
CID 712421: Missed some other occurrences, fixed them as well.