Fixup deque-based test breakages.