Another shipper metadata change.
More shipper synchronization.
Fix escaping in the Makefile.