Change job handling to use the same construct I moved to later.

This could probably be abstracted into a function.