Refactor

I assumed that vars here are symbols and not sexps like the kill-ring code suggests.