Some minor cleaning up (following the closing of https://bugreports.qt-project.org/browse/QTBUG-29549).