Qt 5: some minor cleaning up.