Update to latest, incorporating code review comments.