Auto merge of #161082 - nnethercote:overhaul-CoroutineMarker, r=mejrs

Overhaul `CoroutineKind`

Its structure is a bit weird. Details in individual commits.

r? @mejrs