Minor refactoring of autoreader for speed and clarity.