Bug 984723 - Further scheduling improvements.