Update with pull req feedback.