Update to reflect changes.  Matches 1.7 branch now.