add a TODO to remove the separator helper.