Fixes for VC++ and variadic size usage.

[SVN r86760]