Make "clean" depend on "checked_out"

This is for issue 256.

Also, tidy up calls of add_package_rules so they lie on a single
line, which makes "grepping" give neater results.