Simplify the wrapper's to be a single 'wrapper' and make them all the same.