Address codereview from @mislav

I'll rebase this later. I'm a bit iffy about how to write some of this prose,
some of it seems to have some very subtle semantic meaning which I worry about
breaking.