Revert r22974 int->unsigned parts that don't have any meaningful effect.