[JobQueue] Cleaned up handling of orders a bit.

Change-Id: I83d060e0db97d5bebf042041b0bd20563b093418