Change :matches(s1, s2) to use CompoundSelector
Clean up source code