DatesRole: minor cleanup