Addressed these in 60c537d.