Iwould be in favor of removing return_indicator as well to simplify the interface.