Oops, getting ahead of myself. In the not too distant future separators will be special if multi-hour, but I didn't fully excise that from this pull request. Fixed.