More MSVC compatibility fixes.

This fixes #23.