Updates per perigrin's feedback.