MNT: marginally better waveform string handling