Improve factoring of contracts

[seddonym]

There's a lot of shared code and it's not easy to understand, particularly in relation to descendants - nested loops and the like.

One possible route might be to improve as_subpackages support within Grimp.