Moving $label.and.title.separator out of label.markup templates.