Make sure things keep working in Python 4+