One option suggested by Lara is to add in G.N.E.R.D.S to make it easier to rebuff during PvP. This is good, but it can also make it so you use up your stash of candy in inappropriate places – it might be better to put it as part of your buff macro.