Fixes part of the waveform issue reported in #2567 (closed).
Makes waveforms display correctly at rate=1.0.
Altering the rate is still not properly supported, as that requires some bigger changes in this area of code, but this should be good enough until we figure that out.