Improve support for various wrapper methods and options.
Merge