Was trying to do some work to clean up my theme to make it sharable, but I'm running up against the lack of grouping containers, and the fact that different objects have different HTML representations depending on what page you're on...