Added a work around for some current limitations of std::initializer_list.