Adjust check to not rely on lexicographical order. This amends
8ae3ddca.

Change-Id: I5023b07af819eb09ea9dc569bdbac806f936485f