Fix to confusing and potentially unpredictable conditionals.
This is a fix similar to the djb2_hash fix.
Merge pull request #128 from AkrionXxarr/WarningResolutions

More fixes similar to the djb2_hash fix.