Move TODO out of forthcoming 1.10