A little cleanup based on the latest changes.