Discussed this briefly on IRC with George.

It's ugly, but obvious what's going on. We're going to want to revise
all of this before too long anyway, I'm sure.