Now separates file and section tracking, since sections aren't necessarily cleanly nested in files, and files have some local state. [SVN r75534]