Consolidate conditionals for going past log EOF. #994