More fix up options.  Put in a handler for lists of page names and rip out functions.