That part is still suboptimal. Please either fix or don't delete the TODO.