Met with ECH and SMK to rework the whole feature structure thing, and we went back to a flat model. We'll work with a flat model until we're sure everything is functional and accounted for, and then we'll start adding structure and dependencies as appropriate. This seems the cleanest approach, and will let us get productive again. I've encoded a clean new version of the feature system with no @dcr: attributes or comments, and we'll go from there. I'll start adding back the @dcr attributes soon.