Use newer syntax for Oscillator waves (closes #1)