Making it work with the ever-so-slightly modified interface of the new quicksand refactor.