Minor cleanup for standalone scheduler

See commit messages