Refactor Gitian bundle descriptors

We should try to use the same logic in bundle descriptors as much as possible. That makes necessary changes to them less error-prone.