* Use long long for platforms where long is 32 bits (like windows).

* Make sure scalar chars are signed.

* Re-add NOLINT marker.