Improve outer-expr logic