EMI: Fixes #873, the setup names were substrings of each other, so force
an equality check. Remove the substring versions as it seems they aren't
needed.