Avoided a false assertion in File. Minor clean-ups.