Split EOF handling up from other error handling
Remove Coolline special-casing