fwiw I don't think either of these TODO will ever need doing, they don't matter