Small clean ups I forgot from the last commit.