Simplified Signed/Unsigned mismatch fix.