New 2.0 merged with pending 1.63 changes.

Consider this beta level for now. Testing is needed on the structure
changes imposed by the 2.00<->1.63 merge.