Now that we're hopefully going to be changing the format less. The layering here is now more clear, rather than having things entangled.
Colin Walters