Cleaned up simple class method calls to PyImageSource from CppImagesource