Simplify `accepts` and `returns` hacks.
Remove forgotten TODO.