Cleaned up association of decorators with the records they decorate.