It was causing intermittent failures on GTK. We'll no doubt want tools in the QA framework at some point, but probably not necessary for 6.0....
Also tries to fix a compile issue on gcc.