Replace old return style