Concerning #696: Automatic detection of output_given
Tentative fix to #695, please confirm