diff --git a/src/converter/immutable_converter.cc b/src/converter/immutable_converter.cc
index b601f1156..b784f4c68 100644
--- a/src/converter/immutable_converter.cc
+++ b/src/converter/immutable_converter.cc
@@ -1926,8 +1926,7 @@ void ImmutableConverter::InsertCandidates(const ConversionRequest &request,
     prev = node;
   }
 
-  const size_t expand_size =
-      std::max<size_t>(1, std::min<size_t>(512, max_candidates_size));
+  const size_t expand_size = std::clamp<size_t>(max_candidates_size, 1, 512);
 
   const bool is_single_segment =
       (type == SINGLE_SEGMENT || type == FIRST_INNER_SEGMENT);
diff --git a/src/gui/config_dialog/config_dialog.cc b/src/gui/config_dialog/config_dialog.cc
index d2813ba46..793512ca6 100644
--- a/src/gui/config_dialog/config_dialog.cc
+++ b/src/gui/config_dialog/config_dialog.cc
@@ -551,7 +551,7 @@ void ConfigDialog::ConvertFromProto(const config::Config &config) {
   SET_CHECKBOX(realtimeConversionCheckBox, use_realtime_conversion);
 
   suggestionsSizeSpinBox->setValue(
-      std::max(1, std::min<int>(9, config.suggestions_size())));
+      std::clamp<int>(config.suggestions_size(), 1, 9));
 
   // tab5
   SetSendStatsCheckBox();
diff --git a/src/gui/dictionary_tool/find_dialog.cc b/src/gui/dictionary_tool/find_dialog.cc
index 377a81e90..3d3c498ba 100644
--- a/src/gui/dictionary_tool/find_dialog.cc
+++ b/src/gui/dictionary_tool/find_dialog.cc
@@ -101,7 +101,7 @@ void FindDialog::FindBackward() {
 void FindDialog::Find(FindDialog::Direction direction) {
   const QString &query = QuerylineEdit->text();
   const int start_row = std::max(0, table_->currentRow());
-  int start_column = std::min(1, std::max(0, table_->currentColumn()));
+  int start_column = std::clamp(table_->currentColumn(), 0, 1);
   int matched_column = -1;
   int matched_row = -1;
 
diff --git a/src/prediction/predictor.cc b/src/prediction/predictor.cc
index c621f66ce..5c60292ff 100644
--- a/src/prediction/predictor.cc
+++ b/src/prediction/predictor.cc
@@ -233,7 +233,7 @@ bool DefaultPredictor::PredictForRequest(const ConversionRequest &request,
 
   int size = kPredictionSize;
   if (request.request_type() == ConversionRequest::SUGGESTION) {
-    size = std::min(9, std::max<int>(1, request.config().suggestions_size()));
+    size = std::clamp<int>(request.config().suggestions_size(), 1, 9);
   }
 
   bool result = false;
diff --git a/src/renderer/qt/qt_server.cc b/src/renderer/qt/qt_server.cc
index c7f16d474..b7a9c0b84 100644
--- a/src/renderer/qt/qt_server.cc
+++ b/src/renderer/qt/qt_server.cc
@@ -79,8 +79,7 @@ QtServer::QtServer() : timeout_(0) {
                   std::min(absl::GetFlag(FLAGS_timeout), 60));
   }
 
-  timeout_ =
-      1000 * std::max(3, std::min(24 * 60 * 60, absl::GetFlag(FLAGS_timeout)));
+  timeout_ = 1000 * std::clamp(absl::GetFlag(FLAGS_timeout), 3, 24 * 60 * 60);
   MOZC_VLOG(2) << "timeout is set to be : " << timeout_;
 
 #ifndef MOZC_NO_LOGGING
diff --git a/src/renderer/renderer_server.cc b/src/renderer/renderer_server.cc
index edb290019..0c0ff40db 100644
--- a/src/renderer/renderer_server.cc
+++ b/src/renderer/renderer_server.cc
@@ -164,8 +164,7 @@ RendererServer::RendererServer()
                   std::min(absl::GetFlag(FLAGS_timeout), 60));
   }
 
-  timeout_ =
-      1000 * std::max(3, std::min(24 * 60 * 60, absl::GetFlag(FLAGS_timeout)));
+  timeout_ = 1000 * std::clamp(absl::GetFlag(FLAGS_timeout), 3, 24 * 60 * 60);
   MOZC_VLOG(2) << "timeout is set to be : " << timeout_;
 
 #ifndef MOZC_NO_LOGGING
diff --git a/src/renderer/win32/win32_image_util.cc b/src/renderer/win32/win32_image_util.cc
index 6fa8ad2e6..6aed68dab 100644
--- a/src/renderer/win32/win32_image_util.cc
+++ b/src/renderer/win32/win32_image_util.cc
@@ -651,8 +651,7 @@ HBITMAP BalloonImage::CreateInternal(const BalloonImageInfo &info,
     const int offset_y_;
   };
 
-  const double normalized_blur_alpha =
-      std::min(std::max(info.blur_alpha, 0.0), 1.0);
+  const double normalized_blur_alpha = std::clamp(info.blur_alpha, 0.0, 1.0);
   Accessor accessor(frame_buffer, -info.blur_offset_x, -info.blur_offset_y);
   for (int y = begin_y; y < begin_y + bmp_height; ++y) {
     for (int x = begin_x; x < begin_x + bmp_width; ++x) {
diff --git a/src/rewriter/date_rewriter.cc b/src/rewriter/date_rewriter.cc
index 60db89b26..cb80e2c4f 100644
--- a/src/rewriter/date_rewriter.cc
+++ b/src/rewriter/date_rewriter.cc
@@ -991,8 +991,8 @@ bool DateRewriter::RewriteDate(Segment *segment,
 
   // Date candidates are too many, therefore highest candidate show at most 3rd.
   // TODO(nona): learn date candidate even if the date is changed.
-  constexpr size_t kMinIdx = 3;
-  size_t insert_idx = std::min(std::max(kMinIdx, cand_idx + 1), end_idx);
+  const size_t min_idx = std::min<size_t>(3, end_idx);
+  const size_t insert_idx = std::clamp(cand_idx + 1, min_idx, end_idx);
   segment->insert_candidates(insert_idx, std::move(candidates));
   return true;
 }
diff --git a/src/session/session_handler.cc b/src/session/session_handler.cc
index 12e5c3d59..a7b7ab0ef 100644
--- a/src/session/session_handler.cc
+++ b/src/session/session_handler.cc
@@ -162,9 +162,8 @@ SessionHandler::SessionHandler(std::unique_ptr<EngineInterface> engine)
     absl::SetFlag(&FLAGS_last_command_timeout, 60);
   }
 
-  // allow [2..128] sessions
-  max_session_size_ =
-      std::max(2, std::min(absl::GetFlag(FLAGS_max_session_size), 128));
+  // Allow [2..128] sessions.
+  max_session_size_ = std::clamp(absl::GetFlag(FLAGS_max_session_size), 2, 128);
   session_map_ = std::make_unique<SessionMap>(max_session_size_);
 
   if (!engine_) {
@@ -172,7 +171,7 @@ SessionHandler::SessionHandler(std::unique_ptr<EngineInterface> engine)
   }
 
 
-  // everything is OK
+  // Everything is OK.
   is_available_ = true;
 }