Replace some std::type references