Oops. Missed a few values in the previous commit.