Finish up some comparable work, and set the wrapped stacks to final
inside of CustomWrappedStack (simplifies some things and hopefully
didn't break anything)