Fix test and add vsave varargs annotation.