Hmmmn... Apparently I'd forgotten to merge one change in from the branch. Ooops.