More MSVC fixes -- class/struct conflicts.