Moved some helper code into new support.py.