Changes to remove dependency on C++11 / initializer lists - odd Notation.cc error