Finish the PySide -> PyQt port and some cleanup