Use an honest-to-god queue object instead of a ghetto set
Unbreak addkey