Re #431 Refactoring FullBeanDecorator.