I would just remove this TODO for now -- it's always possible to add more features.