Try to work around Visual C++'s variadic overload bug.

Possibly too late for the release.

[SVN r86482]