I think I'm going to make the change I described to File/FileContent in a followup change... it really does seem to improve things.