Get spin terms working in waveform modes