Missed a couple of changes in the prior commit.