Further clean up of the methods/classes.

This currently doesn't work, as fileID passed to the LogFileLoader
ctor is -1. It seems that there is a problem retrieving the
OriginalFile associated with the annotation file.