Another TODO fixed.