Just merged the int64 change to hopefully make your patch simpler to review :)