I'll probably be unifying these two as part of the replace-across-files work, so in the meantime we should just keep this the way it is so as not to break other logic in this version of the code (and to make it easier to merge changes one way or the other).