Might be time to break out util.py into a proper submodule.