Use given/when instead of EVAL for operator resolution; Ref issue #1
Still unhappy with performance.