Wow, adding a 100nf capacitor between ground and the analog pin really works for this sort of problem. Kind of amazing.