Replace use of boost with std