Merge the const and non-const Type::getScalarType to a const version that returns...