R1:4d6f1cd9a14c

Minor, celerity map.

(I've removed my merge rule; I think it's no good after the arc land updates of a while ago.)