Removing needless qWaits and replacing others with QTRY_VERIFYs