Squash Registry methods JobTarget & JobTargetState into Job

It is, but I'm tired of having things like this just sit around in the code forever without being addressed. Either it matters and we file an issue, or we move on.