Use Set.has instead of Array.indexOf for enum comparison (perf improvement)

Use Set.has instead of Array.indexOf for enum comparison (perf improvement) #1537