The more radical change is still needed for SI-4695.

This one is actually pretty straight forward. It became much clearer to me when Martin explained how members of package objects are copied into the enclosing package class scope. I do welcome proposals for additional test cases, but I don't think we should delay this.