Cleanup comments
Debugging: rethrow the same exception after printing
More missing classes from TypeMap
Cleanup Job key removal some more; handle missing-key better