schema: more minor FileReader cleanups

Change-Id: Ia37d82024faf16c262f339d8f7f807d23670edda