These changes are in line with similar changes in other modules, and
with standard Python interface.