Update for python-mode changes