Clean up parsing of MSVC again