For efficiency, this code should also be refactored. We should store `r1`, `r12`, and `r13` when making surface geoms. Note these are also used by the source-space code, so they could also be used there.