Oops, wrong keyword arguments
Recognize more FD waveforms