Restore @ahojnnes's overflow test.  Correctly assign out argument.