Replaced more C arrays by C++11 arrays