Rework FileStream interface slightly to prepare for general stream work.