Merge "Actually terminate on EOF"