My bad, I forgot about these. They fit in the same category as the `ast_map` change, but I can't remember if I tried mapping to `NodeId`s instead.