Try harder to avoid duplicate order state IDs.

An order whose state was changed from delivered to something else then
back to delivered might still appear in the order state array despite
the presence of the hacked query to filter them out.

We now run a secondary hack to remove them from the array.

A better solution is needed here...