Good point. I'll move the TODO.