Refactor decorators to use the decorator base class.