A quick figure eight on your fingers works wonders. Put your thumb and pinkie out and figure eight around them. With a few inches left, hank the rope like in this diagram. (specifically, steps 17-21)
It looks a little complicated until you practice it a couple of times. I am now really fast at it and do it for all of my lines. I even do it with the extra part of the whoopie slings, so it isn't hanging down in my way. No tangles.