Ensure defn metadata are always preserved as a map (#1187)
#1315
| Job | Run time |
|---|---|
| 10m 49s | |
| 10m 35s | |
| 10m 33s | |
| 10m 29s | |
| 10m 54s | |
| 8m 13s | |
| 12m 57s | |
| 13m 39s | |
| 12m 42s | |
| 6m 38s | |
| 26s | |
| 1h 47m 55s |