diff --git a/_.cpp b/_.cpp
index 1df4b06..15783e9 100644
--- a/_.cpp
+++ b/_.cpp
@@ -1,11 +1,10 @@
 /* Check cf5-opt.vim defs.
-VIM: let g:lcppflags="-std=c++11 -O2 -pthread"
-VIM: let g:wcppflags="/O2 /EHsc /DWIN32"
-VIM: let g:cppflags=g:Iboost.g:Itbb
-VIM: let g:ldflags=g:Lboost.g:Ltbb.g:tbbmalloc.g:tbbmproxy
-VIM: let g:ldlibpath=g:Bboost.g:Btbb
-VIM: let g:argv=""
-VIM-: let g:cf5output=0
+VIM: let b:lcppflags="-std=c++11 -O2 -pthread"
+VIM: let b:wcppflags="/O2 /EHsc /DWIN32"
+VIM: let b:cppflags=g:Iboost.g:Itbb
+VIM: let b:ldflags=g:Lboost.g:Ltbb.g:tbbmalloc.g:tbbmproxy
+VIM: let b:ldlibpath=g:Bboost.g:Btbb
+VIM: let b:argv=""
 */
 #include <iostream>
 #include <exception>
diff --git a/cpp/exception.cpp b/cpp/exception.cpp
index 1f6c18b..150869f 100644
--- a/cpp/exception.cpp
+++ b/cpp/exception.cpp
@@ -1,11 +1,7 @@
 /* Check cf5-opt.vim defs.
 VIM: let g:lcppflags="-std=c++11 -O2 -pthread"
 VIM: let g:wcppflags="/O2 /EHsc /DWIN32"
-VIM: let g:cppflags=g:Iboost.g:Itbb
-VIM: let g:ldflags=g:Lboost.g:Ltbb.g:tbbmalloc.g:tbbmproxy
-VIM: let g:ldlibpath=g:Bboost.g:Btbb
 VIM: let g:argv=""
-VIM-: let g:cf5output=0
 */
 #include <iostream>
 #include <exception>
diff --git a/cpp/rvalue.cpp b/cpp/rvalue.cpp
index c229952..6cf48e6 100644
--- a/cpp/rvalue.cpp
+++ b/cpp/rvalue.cpp
@@ -1,7 +1,7 @@
 /* 
-VIM: let g:lcppflags="-std=c++11 -O2 -pthread"
-VIM: let g:wcppflags="/O2 /EHsc /DWIN32"
-VIM: let g:argv=""
+VIM: let b:lcppflags="-O1 -std=c++11 -O2 -pthread"
+VIM: let b:wcppflags="/O2 /EHsc /DWIN32"
+VIM: let b:argv=""
 */
 
 #include <iostream>