Sync changes from latest snowball compiler version