Cleaned up job loop types a bit

Change-Id: I7b83ff5f88eb095a763df996c6ab469b03e29d0a