drop in threaded waveview changes via the two affected files.