Minor cleanup related to previous commit.