More C++14 conversions.