Change EOF Parsing to be non-recursive

Change EOF Parsing to be non-recursive #3065