Refactor Macro and PythonClass code around new implementation of 'new'