Last attempt to be more conservative on stack use