As a reminder to myself if these changes were to gain traction, section 5.9.5 (adopting a package) will also need some rewriting since certain instructions overlap salvaging. Best wishes, Mike