Removing even/odd reading hack and just protecting parser from eof-ing ports