remove use of operator-style expressions