When depickme-ing, only requeue pickmes that conflict-pickme

Requeueing all pickmes is a massive performance drop in real-world enviroments.

When a pickme is removed, only requeue pickmes who'se tags might be cleared by a recheck now that the pickme is gone.
also prefer mock.patch.object(...) to mock.patch(...)