diff --git a/AMBuildScript b/AMBuildScript
index 580b0807..d2b99d54 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -249,7 +249,7 @@ class SMConfig(object):
       if cxx.like('gcc'):
         cxx.cflags += ['-O3']
       elif cxx.like('msvc'):
-        cxx.cflags += ['/Ox']
+        cxx.cflags += ['/Ox', '/Zo']
         cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
 
     # Debugging
@@ -257,8 +257,6 @@ class SMConfig(object):
       cxx.defines += ['DEBUG', '_DEBUG']
       if cxx.like('msvc'):
         cxx.cflags += ['/Od', '/RTC1']
-        if cxx.version >= 1600:
-          cxx.cflags += ['/d2Zi+']
 
     # This needs to be after our optimization flags which could otherwise disable it.
     if cxx.vendor == 'msvc':