Refactor the parser to have fewer *_no_str intermediate rules
#3318
| Job | Run time |
|---|---|
| 5m 2s | |
| 5m 29s | |
| 5m 9s | |
| 1m 58s | |
| 5m 38s | |
| 5m 58s | |
| 6m 15s | |
| 6m 23s | |
| 1m 3s | |
| 6m 23s | |
| 6m 27s | |
| 1m 1s | |
| 4m 39s | |
| 6m 3s | |
| 6m 6s | |
| 6m 12s | |
| 4m 15s | |
| 4m 45s | |
| 6m 41s | |
| 7m 17s | |
| 4m 37s | |
| 4m 59s | |
| 4m 31s | |
| 4m 45s | |
| 2h 1m 36s |