Now runs under both python 2 and 3.