More tweaks to scheduling for rotation choices.