I actually couldn't make heads or tails of it either way, but as it looks like it works fine, I removed the TODO.