Concerning #661, squashing some clang compile errors in swig interface