One good piece of advice I gleaned from Martin Simpson was, as well as practicing your songs, practice retuning until you can do it effortlessly. Easier said than done!