(#647) Ensure EOF cursor behavior remains the same.