Ensure correct type for both sides of the conditional to prevent compiler warnings
Fix incorrect handling of nul characters in uc_width