Removed use of workaround for operators of operators