I think the TODO would resolve that. I'll make the issue now.