Update for unified Int format in Neko 2