Partially revert #596, give PAlternative (and friends) the correct kinds
#307
| Job | Run time |
|---|---|
| 10m 22s | |
| 1m 49s | |
| 1m 56s | |
| 1m 48s | |
| 1m 33s | |
| 1m 41s | |
| 1m 30s | |
| 1m 29s | |
| 1m 32s | |
| 1m 29s | |
| 1m 20s | |
| 1m 42s | |
| 28m 11s |