Changed value tagging to work under msvc.