Fix various helpers that were not handling name collisions between global and cluster-specific structs. #3888
| Job | Run time |
|---|---|
| 5m 59s | |
| 5m 59s | |
| 5m 57s | |
| 5m 45s | |
| 6m 44s | |
| 7m 4s | |
| 1s | |
| 1s | |
| 1s | |
| 0s | |
| 55s | |
| 8m 41s | |
| 7m 41s | |
| 54m 48s |
| Job | Run time |
|---|---|
| 5m 59s | |
| 5m 59s | |
| 5m 57s | |
| 5m 45s | |
| 6m 44s | |
| 7m 4s | |
| 1s | |
| 1s | |
| 1s | |
| 0s | |
| 55s | |
| 8m 41s | |
| 7m 41s | |
| 54m 48s |