Made register_with_eos backward compatible