Some minor cleanup of the last commit.