A little more "cleanup" of Python code.