I had Evap o rust on my shopping list for a while, never got to a real auto parts store to ask, and naval jelly did nothing.
quite by accident, this past week I went to Tractor Supply to buy cat food, and they had Evap o rust in one of the bins.
Hopefully today I will have some things soaking.