cleanup, more use of TextFilePos type