Changes towards better type safety regarding intervals, primarily