Remove va_list workaround