Add multiple-waveform support, with four example waveforms.