Cherry pick some target-independent Morello changes #171

Closed arichardson closed 3 years ago