Further work on transition to PySide.