Forgot to merge some more changes when collapsing things down to a single data structure.