Small revisions. Tag as v4.0.9.