EAGLESIX-3157: matcher cmp: fix type check, make init() better match original (a switch is faster than indexOf anyhow)