Actually add --batch-mode to jar target.
Replace GeneratedUnsafe with the generics trick.