Switch to use initializer-list ctor