Whoops. Missed a few things in that last commit.