Remove extra uses of the :return option