DatesRole: Minor tidyup