Correct Boundaries.next() / Boundaries.prev() and improve BoundaryMarkers