Tidy wrappers and augmentations #693
Description
As highlighted by #690, there is now quite a lot of code relating to Wrapper and Augmentation objects. They could do with a tidy to minimise duplicated code and help them work with other options.
{{ message }}