Improved syntax around stopping, and removed the NullJobTracker