Searching for my lost sugar and spice

The story:

For some time I thought he was singing in part
about a romantic relationship, hence the "sugar
and spice". Then one day, about five or six years
ago, I realized I was dead wrong from watching the
Game Show Network game show "Catch 21" with one of
their questions. Why I don't think my version was
better than the original is that "shaker of salt"
makes MUCH more sense, as he is singing about
margarita, which calls for salt, of course. But
what can be so confusing is that a "shaker of
salt" is much better known as a "salt shaker".