Code cleanup

More refinements to shift octave to delegate events, thus avoiding one
event listener. Cleanup in the gulpfile, too.