antoniop
committed
on 08 Jan 18
Make so that these clauses are really clauses and not time intervals, as downstream code will be hacky otherwise