Remove (defined _MSC_VER) from cpp workaround