Revert "Comparing to int64 zero"

This reverts commit 065de90cb361802928688e41730dc97f1743fd55.
New string limits and new string comparator