Incorporating more comments.

See 22e3b3a.