nit: `TODO(SimonSapin)` is preferred style now I think