Let's assume these changes will make it through to Python 4