Improve waveform selection logic.