Cleaned up the va_list usage, and tweaked a few tests.