This revision cleans up region containment so that the containing region does not have to start on the same line as the selection. As a result, bookmark toggling now behaves uniformly; bookmarks can be toggled by identifying any selection within the bookmark.