Try to greatly simplify new queue adapters by merging in common code