Correct various structure and architecture problems in code including:

Update to latest (although not new) upstream vendor version.

(0) -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 tip

mercurial