cherry-pick 4ead4d39: sched/alt: Optimization and code clean-up

Research about cherry-picking 4ead4d39