Another round of changes motivated by reviewer comments.