Fix a what-is-this-cast-doing-here problem. Add a TODO.