Use more C++11 uniform initialization