#116 Remove direct calls to .Invoke and use ExpressionBuilder