Minor changes per comments.