Use the new Python wrapper cleanly written in C++ in replacement of the old bunch of cumbersome C-style macros.