[C++ PATCH] Kill -fno-for-scope