A bit of cleanup around job management and retrieval