Brace cleanup in Extract.cpp and File.cpp