Oops, forgot to update that in a couple of other places too. I'm
tired...