That TODO is clearly resolved.