Waveform speed improvements. Small part of VIX-192.

...ree while the waveform is being plotted.