Fair enough. I think that should be fine in this code. Another good reason that we should clean up the api for the ContentStore and static replacement, so that we don't have to have all of these special cases depending on whether we're in an XML world or a mongo one.