Bit of reworking; going to use context_->filename instead of tracking url separately.  Remove oformat_ in favor of context->oformat.  Trying to consolidate stuff, the additional variables make code hard to follow.