r26637: More work converting to Python.