Yup, I didnt want to touch the rest of the code since I expected there would be work being done on it, seems like the divider behaviour should be opt in (or more likely moved to the caller)