Add the ability to bail out of the automatic return value conversion