MERGE: Fix a few uses of the wrong return convention for the scheduler