Whoops, this weirdness was leftover from a previous attempt at building these data structures. I'll fix that.