More changes needed to support GO = "long long"