File-splitter changes

Should be left to the base class.