Various tweaks by Jack because of the different module name, adaptation
to the Python style, etc.
1 file changed