Now (per discussion on #471) we use one file per crate.

I've tried to be more explicit about the format to use, and what to
add when.