Eliminate use of std::common_type