SI: Group use-cases for clarity.

1, 2, 4, and 5 are different takes on the same feature. 3 and
6 are distinct, and we should make that clear in the doc.