Modify _procudures.py to partially prepare for removal of the old API
Still quite a bit more work needed though