Some minor cleanup/tweaks to scheduling.