Clean up the backups package.

This is intended as an idempotent change in preparation for further patches.
jc.SameContents will deal with this without the need to sort