diff --git a/emper/strategies/laws/LawsDispatcher.cpp b/emper/strategies/laws/LawsDispatcher.cpp
index 8c42f22fe1214295879cb9a60a9a7b40291fd5bd..1c21d2b40b205a72c1a02dbaceabfb1d1430a8e8 100644
--- a/emper/strategies/laws/LawsDispatcher.cpp
+++ b/emper/strategies/laws/LawsDispatcher.cpp
@@ -28,7 +28,7 @@ void LawsDispatcher::dispatchLoop() {
 		// is runnable.
 		if (isRunnable(fiber)) {
 			if constexpr (emper::STATS) {
-				LawsStrategy::FiberSource fiberSource =
+				auto fiberSource =
 						static_cast<LawsStrategy::FiberSource>(fiber->getFlag());
 				switch (fiberSource) {
 					case LawsStrategy::FiberSource::fromPriority:
diff --git a/emper/strategies/laws/LawsScheduler.cpp b/emper/strategies/laws/LawsScheduler.cpp
index 43dbfdda1270146161eb6e6d69d95427d886f667..57a33406870d8df8f73064549f3719705288d2ef 100644
--- a/emper/strategies/laws/LawsScheduler.cpp
+++ b/emper/strategies/laws/LawsScheduler.cpp
@@ -79,7 +79,7 @@ auto LawsScheduler::nextFiber() -> Fiber* {
 	if (fiber != nullptr) {
 		// We fetched a fiber from your local priority queue.
 		if constexpr (emper::STATS) {
-			unsigned int flag = static_cast<unsigned int>(LawsStrategy::FiberSource::fromPriority);
+			auto flag = static_cast<unsigned int>(LawsStrategy::FiberSource::fromPriority);
 			fiber->setFlag(flag);
 		}
 
@@ -90,7 +90,7 @@ auto LawsScheduler::nextFiber() -> Fiber* {
 
 	if (likely(poped)) {
 		if constexpr (emper::STATS) {
-			unsigned int flag = static_cast<unsigned int>(LawsStrategy::FiberSource::fromLocal);
+			auto flag = static_cast<unsigned int>(LawsStrategy::FiberSource::fromLocal);
 			fiber->setFlag(flag);
 		}
 
@@ -106,7 +106,7 @@ auto LawsScheduler::nextFiber() -> Fiber* {
 	poped = queues[victim]->popTop(&fiber);
 	if (poped) {
 		if (emper::STATS) {
-			unsigned int flag = static_cast<unsigned int>(LawsStrategy::FiberSource::stolen);
+			auto flag = static_cast<unsigned int>(LawsStrategy::FiberSource::stolen);
 			fiber->setFlag(flag);
 		}
 
@@ -119,7 +119,7 @@ auto LawsScheduler::nextFiber() -> Fiber* {
 	poped = mainThreadQueue->popTop(&fiber);
 	if (poped) {
 		if constexpr (emper::STATS) {
-			unsigned int flag = static_cast<unsigned int>(LawsStrategy::FiberSource::mainThread);
+			auto flag = static_cast<unsigned int>(LawsStrategy::FiberSource::mainThread);
 			fiber->setFlag(flag);
 		}