Random polish

See individual commits.

I wanted to include one that fixes pixel alignment for the waveform, but seems the whole thing is so imprecise I can't tell if my changes are making it worse or not.

So that will be separate, no reason to block everything else on it.