diff --git a/common_video/h264/h264_bitstream_parser.cc b/common_video/h264/h264_bitstream_parser.cc
index 1f9032c943..439beecec2 100644
--- a/common_video/h264/h264_bitstream_parser.cc
+++ b/common_video/h264/h264_bitstream_parser.cc
@@ -44,7 +44,7 @@ H264BitstreamParser::Result H264BitstreamParser::ParseNonParameterSetNalu(
   if (!sps_ || !pps_)
     return kInvalidStream;
 
-  last_slice_qp_delta_ = rtc::Optional<int32_t>();
+  last_slice_qp_delta_ = rtc::nullopt;
   const std::vector<uint8_t> slice_rbsp =
       H264::ParseRbsp(source, source_length);
   if (slice_rbsp.size() < H264::kNaluTypeSize)
@@ -262,7 +262,7 @@ H264BitstreamParser::Result H264BitstreamParser::ParseNonParameterSetNalu(
     return kInvalidStream;
   }
 
-  last_slice_qp_delta_ = rtc::Optional<int32_t>(last_slice_qp_delta);
+  last_slice_qp_delta_ = last_slice_qp_delta;
   return kOk;
 }
 
diff --git a/common_video/h264/pps_parser.cc b/common_video/h264/pps_parser.cc
index 03be307f03..407b15c722 100644
--- a/common_video/h264/pps_parser.cc
+++ b/common_video/h264/pps_parser.cc
@@ -17,9 +17,9 @@
 #include "rtc_base/bitbuffer.h"
 #include "rtc_base/logging.h"
 
-#define RETURN_EMPTY_ON_FAIL(x)                  \
-  if (!(x)) {                                    \
-    return rtc::Optional<PpsParser::PpsState>(); \
+#define RETURN_EMPTY_ON_FAIL(x) \
+  if (!(x)) {                   \
+    return rtc::nullopt;        \
   }
 
 namespace {
@@ -65,15 +65,15 @@ rtc::Optional<uint32_t> PpsParser::ParsePpsIdFromSlice(const uint8_t* data,
   uint32_t golomb_tmp;
   // first_mb_in_slice: ue(v)
   if (!slice_reader.ReadExponentialGolomb(&golomb_tmp))
-    return rtc::Optional<uint32_t>();
+    return rtc::nullopt;
   // slice_type: ue(v)
   if (!slice_reader.ReadExponentialGolomb(&golomb_tmp))
-    return rtc::Optional<uint32_t>();
+    return rtc::nullopt;
   // pic_parameter_set_id: ue(v)
   uint32_t slice_pps_id;
   if (!slice_reader.ReadExponentialGolomb(&slice_pps_id))
-    return rtc::Optional<uint32_t>();
-  return rtc::Optional<uint32_t>(slice_pps_id);
+    return rtc::nullopt;
+  return slice_pps_id;
 }
 
 rtc::Optional<PpsParser::PpsState> PpsParser::ParseInternal(
@@ -183,7 +183,7 @@ rtc::Optional<PpsParser::PpsState> PpsParser::ParseInternal(
   RETURN_EMPTY_ON_FAIL(
       bit_buffer->ReadBits(&pps.redundant_pic_cnt_present_flag, 1));
 
-  return rtc::Optional<PpsParser::PpsState>(pps);
+  return pps;
 }
 
 bool PpsParser::ParsePpsIdsInternal(rtc::BitBuffer* bit_buffer,
diff --git a/common_video/video_render_frames.cc b/common_video/video_render_frames.cc
index deaa40975d..5c732df2cf 100644
--- a/common_video/video_render_frames.cc
+++ b/common_video/video_render_frames.cc
@@ -77,8 +77,7 @@ rtc::Optional<VideoFrame> VideoRenderFrames::FrameToRender() {
   rtc::Optional<VideoFrame> render_frame;
   // Get the newest frame that can be released for rendering.
   while (!incoming_frames_.empty() && TimeToNextFrameRelease() <= 0) {
-    render_frame =
-        rtc::Optional<VideoFrame>(std::move(incoming_frames_.front()));
+    render_frame = std::move(incoming_frames_.front());
     incoming_frames_.pop_front();
   }
   return render_frame;