Following ECH's analysis of the feature structures, I'm refactoring them, breaking out the general categories into smaller ones. Once that's done, we can see about how we might recombine them to create feature structures at higher levels, both in the declaration and in the documents.