Add Sawtooth and Triangle oscillators, and remove a bunch of redundant code.