Need to modify code to use fewer C++11 so that SWIG works