Improve handling of Powerline and default Python.