Minor cleanup for dev-qt/qtdeclarative and dev-python/PyQt5