Progress in removing class method delegation