decorators now return a wrapper instead of self.