Convert delegate to use an object type and remove FIXME from closed issue