Fix transplant of WaveGen to separate module