Perfect.  I'll make this change directly along with the typos.  Let's continue the discussion on the later point with #468.  Thanks.