Charlie: As you ifdef out the capability page support, please wrap it in #ifdef DEAD_CAP_PAGES rather than #if 0. The problem with #if 0 is that when we strip things out we have to do a lot of reading to figure out what/why we are stripping. Jonathan