diff --git a/CalibTracker/SiPixelESProducers/plugins/SiPixelGainCalibrationForHLTGPUESProducer.cc b/CalibTracker/SiPixelESProducers/plugins/SiPixelGainCalibrationForHLTGPUESProducer.cc
index bf8a0b2c5a75f..37055ea3e00ca 100644
--- a/CalibTracker/SiPixelESProducers/plugins/SiPixelGainCalibrationForHLTGPUESProducer.cc
+++ b/CalibTracker/SiPixelESProducers/plugins/SiPixelGainCalibrationForHLTGPUESProducer.cc
@@ -25,7 +25,9 @@ class SiPixelGainCalibrationForHLTGPUESProducer : public edm::ESProducer {
 };
 
 SiPixelGainCalibrationForHLTGPUESProducer::SiPixelGainCalibrationForHLTGPUESProducer(const edm::ParameterSet& iConfig) {
-  setWhatProduced(this).setConsumes(gainsToken_).setConsumes(geometryToken_);
+  auto cc = setWhatProduced(this);
+  gainsToken_ = cc.consumes();
+  geometryToken_ = cc.consumes();
 }
 
 void SiPixelGainCalibrationForHLTGPUESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEFastESProducer.cc b/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEFastESProducer.cc
index 8b6cba9a9232b..3f7c9aca2a974 100644
--- a/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEFastESProducer.cc
+++ b/RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEFastESProducer.cc
@@ -39,20 +39,19 @@ class PixelCPEFastESProducer : public edm::ESProducer {
 
 using namespace edm;
 
-PixelCPEFastESProducer::PixelCPEFastESProducer(const edm::ParameterSet& p) {
-  std::string myname = p.getParameter<std::string>("ComponentName");
-  auto magname = p.getParameter<edm::ESInputTag>("MagneticFieldRecord");
+PixelCPEFastESProducer::PixelCPEFastESProducer(const edm::ParameterSet& p) : pset_(p) {
+  auto const& myname = p.getParameter<std::string>("ComponentName");
+  auto const& magname = p.getParameter<edm::ESInputTag>("MagneticFieldRecord");
   UseErrorsFromTemplates_ = p.getParameter<bool>("UseErrorsFromTemplates");
 
-  pset_ = p;
-  auto c = setWhatProduced(this, myname);
-  c.setConsumes(magfieldToken_, magname)
-      .setConsumes(pDDToken_)
-      .setConsumes(hTTToken_)
-      .setConsumes(lorentzAngleToken_, edm::ESInputTag(""));
-  c.setConsumes(lorentzAngleWidthToken_, edm::ESInputTag("", "forWidth"));
+  auto cc = setWhatProduced(this, myname);
+  magfieldToken_ = cc.consumes(magname);
+  pDDToken_ = cc.consumes();
+  hTTToken_ = cc.consumes();
+  lorentzAngleToken_ = cc.consumes(edm::ESInputTag(""));
+  lorentzAngleWidthToken_ = cc.consumes(edm::ESInputTag("", "forWidth"));
   if (UseErrorsFromTemplates_) {
-    c.setConsumes(genErrorDBObjectToken_);
+    genErrorDBObjectToken_ = cc.consumes();
   }
 }