Prefer to close completion channels instead of <-struct{}{} (#1072)

Prefer to close completion channels instead of <-struct{}{} (#1072) #3278