I thought so. Another one of those bugs due to this stupid in_array() behavior.

So the current tests are fine then? Does everything look OK to be merged?