Add TODO to optimize the apply away