Fix a bunch of minor style issues in waveform/.
Merge branch 'master' into features_effects