MSVC: compilation works again (+minor style fixes)
Merge pull request #1497 from cremno/msvc-debug-info-feature

MSVC: compilation works again (+minor style fixes)