I would think a more transparent decorator wouldn't need these kinds of changes.