Leftover cleanup from last commit.