Cleaned up handling of decorators