Change TODO about the generic end state -- it just needs translaiton not to go away entirely.