Go back to using #name in Compare
Convert Within to new comparator format
Use name instead of expr in Strcompare