Forward compatibility with new wrapper install sequence.

The wrapper code to match these changes will be checked in once
I have tested it, but this will work with old wrappers.