Incorporate more suggestions from comments.