Reinstate 'each'.
Kill 'manifestType' (it can be inferred).
Remove 'GeneratedLocation' and reduce 'UnknownLocation'.
Make some names more consistent.