Fix a pair of issues where const was (unintentionally) cast away
#8909
| Job | Run time |
|---|---|
| 39m 6s | |
| 33m 21s | |
| 8m 54s | |
| 43m 7s | |
| 32m 47s | |
| 26m 9s | |
| 31m 53s | |
| 27m 29s | |
| 48m 37s | |
| 1h 13m 21s | |
| 3m 13s | |
| 12m 46s | |
| 16m 59s | |
| 1h 12m 0s | |
| 36m 36s | |
| 1h 6m 10s | |
| 55m 42s | |
| 43m 37s | |
| 21m 45s | |
| 11h 33m 32s |