Osc: simplify waveforms