Revised wrapper generator code.
Merge branch 'revise-wrappers' into dev