Made exit path ifdef more consistent