remove special case in foldexpr